From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Fri, 22 Jun 2007 01:03:24 +0000 (+0000)
Subject: (math-read-number-simple): New function.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18259
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a77ae2529f104486ad9685604cb6339f903c0d3e;p=emacs.git

(math-read-number-simple): New function.
---

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 6f37568ece4..96f93e0467b 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -3423,6 +3423,24 @@ See calc-keypad for details."
     ;; Syntax error!
     (t nil))))
 
+;;; Parse a very simple number, keeping all digits.
+(defun math-read-number-simple (s)
+   (cond
+    ;; Integer
+    ((string-match "^[0-9]+$" s)
+     (cons 'bigpos (math-read-bignum s)))
+    ;; Minus sign
+    ((string-match "^-[0-9]+$" s)
+     (cons 'bigneg (math-read-bignum (substring s 1))))
+    ;; Decimal point
+    ((string-match "^\\(-?[0-9]*\\)\\.\\([0-9]*\\)$" s)
+     (let ((int (math-match-substring s 1))
+	   (frac (math-match-substring s 2)))
+       (list 'float (math-read-number-simple (concat int frac))
+             (- (length frac)))))
+    ;; Syntax error!
+    (t nil)))
+
 (defun math-match-substring (s n)
   (if (match-beginning n)
       (substring s (match-beginning n) (match-end n))